Merge "rdbms: Roll back empty implicit transaction on error"